Update to master

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
index 7b286e8929dae7d0317f68cc78bc226c9b0ccc73..01c9431af152ce61d03f83dcc1c332306f29a25d 100644 (file)
--- a/src/cargo/util/process_builder.rs
+++ b/src/cargo/util/process_builder.rs
@@ -77,7 +77,7 @@ impl ProcessBuilder {
     pub fn exec(&self) -> Result<(), ProcessError> {
         let mut command = self.build_command();
         command
-            .env(self.build_env().as_slice())
+            .env_set_all(self.build_env().as_slice())
             .stdout(InheritFd(1))
             .stderr(InheritFd(2));
 
@@ -96,7 +96,7 @@ impl ProcessBuilder {
 
     pub fn exec_with_output(&self) -> Result<ProcessOutput, ProcessError> {
         let mut command = self.build_command();
-        command.env(self.build_env().as_slice());
+        command.env_set_all(self.build_env().as_slice());
 
         let msg = || format!("Could not execute process `{}`",
                              self.debug_string());